[clang][Sema] Avoid warnings when mixing diagnostic categories (NFC) #159316
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These statements conditionally select between diagnostics of different categories (common vs. sema). Although the diagnostic IDs do not overlap between categories, they are organized in different enums, and this raises warnings in specific compilers. The clang warning suggest this behavior is deprecated in C++20. By converting the diagnostic IDs to unsigned, we avoid the issue.
llvmbot
added
clang
|
Example of compiler warnings: https://godbolt.org/z/T9hc8M744 |
|
@llvm/pr-subscribers-clang Author: Bruno De Fraine (brunodf-snps) ChangesThese statements conditionally select between diagnostics of different categories (common vs. sema). Although the diagnostic IDs do not overlap between categories, they are organized in different enums, and this raises warnings in specific compilers. The clang warning suggest this behavior is deprecated in C++20 (the warning is ignored by default in C++17 mode). By converting the diagnostic IDs to unsigned, we avoid the issue. Full diff: https://github.com/llvm/llvm-project/pull/159316.diff 2 Files Affected:
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 44906456f3371..12f06070a3db2 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -6836,9 +6836,10 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL,
if (AL.getKind() == ParsedAttr::UnknownAttribute ||
!AL.existsInTarget(S.Context.getTargetInfo())) {
if (AL.isRegularKeywordAttribute() || AL.isDeclspecAttribute()) {
- S.Diag(AL.getLoc(), AL.isRegularKeywordAttribute()
- ? diag::err_keyword_not_supported_on_target
- : diag::warn_unhandled_ms_attribute_ignored)
+ S.Diag(AL.getLoc(),
+ AL.isRegularKeywordAttribute()
+ ? (unsigned)diag::err_keyword_not_supported_on_target
+ : (unsigned)diag::warn_unhandled_ms_attribute_ignored)
<< AL.getAttrName() << AL.getRange();
} else {
S.DiagnoseUnknownAttribute(AL);
diff --git a/clang/lib/Sema/SemaStmtAttr.cpp b/clang/lib/Sema/SemaStmtAttr.cpp
index 77aa7164d4555..66785c7deee57 100644
--- a/clang/lib/Sema/SemaStmtAttr.cpp
+++ b/clang/lib/Sema/SemaStmtAttr.cpp
@@ -673,9 +673,10 @@ static Attr *ProcessStmtAttribute(Sema &S, Stmt *St, const ParsedAttr &A,
(S.Context.getLangOpts().SYCLIsDevice && Aux &&
A.existsInTarget(*Aux)))) {
if (A.isRegularKeywordAttribute() || A.isDeclspecAttribute()) {
- S.Diag(A.getLoc(), A.isRegularKeywordAttribute()
- ? diag::err_keyword_not_supported_on_target
- : diag::warn_unhandled_ms_attribute_ignored)
+ S.Diag(A.getLoc(),
+ A.isRegularKeywordAttribute()
+ ? (unsigned)diag::err_keyword_not_supported_on_target
+ : (unsigned)diag::warn_unhandled_ms_attribute_ignored)
<< A << A.getRange();
} else {
S.DiagnoseUnknownAttribute(A);
|
|
Tagging @erichkeane @Sirraide |
|
@brunodf-snps @mstorsjo Please synchronize to avoid duplicates Duplicate of #159338 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These statements conditionally select between diagnostics of different categories (common vs. sema). Although the diagnostic IDs do not overlap between categories, they are organized in different enums, and this raises warnings in specific compilers. The clang warning suggest this behavior is deprecated in C++20 (the warning is ignored by default in C++17 mode). By converting the diagnostic IDs to unsigned, we avoid the issue.